Commit Graph

27 Commits

Author SHA1 Message Date
OldHawk
f052ea853e Merge commit 'b43c80e2c097b11114f4e4f01b9718321721a89b'
* commit 'b43c80e2c097b11114f4e4f01b9718321721a89b':
  feat(build): Update dependencies (#1847)
  fix(travis): Fix Travis failing on webdriver issues (#1845)
  fix(eslint): Inconsistent spacing before function parentheses (#1844)
  fix(mongodb): update ssl connection settings (#1809)
  Remove deprecated crypto package (#1843)
  feat(config): Mongo Seed 2.0 (#1808)
  fix(users): don't fail on missing old image on image upload (#1839)
  feat(build): Turn on mangling for uglify (#1841)
  fix(gulp): fix broken test:server:watch task (#1842)
  feat(core): Enhancement page title directive (#1686)
  feat(user): Add email support to forgot password (#1834)
  fix(mocha): update mochajs version to reduce vulnerabilities (#1830)
  refactor(menus): Refactor to the Menus client service to use functional loops/filters (#1575)
  feat(config): Mongoose 4.11 upgrade (#1818)

# Conflicts:
#	config/env/development.js
#	config/lib/app.js
#	modules/articles/server/models/article.server.model.js
#	modules/chat/client/config/chat.client.routes.js
#	modules/core/client/directives/page-title.client.directive.js
#	modules/core/client/services/menu.client.service.js
#	modules/users/client/config/users-admin.client.routes.js
#	modules/users/client/views/password/forgot-password.client.view.html
#	modules/users/server/models/user.server.model.js
#	package.json
2017-08-22 13:35:29 +08:00
Pierre Brisorgueil
c69644db65 feat(core): Enhancement page title directive (#1686)
* fix(users): test for usernameOrEmail

* Add comment to remind  change for mongo replicaset connection

* clean comment ..

* Generic pageTitle concept

* Revert "Generic pageTitle concept"

This reverts commit ff00ec950f085ca3b6d1abb564eab1965ab0a56e.

* align on meanjs state

* fix atom beautify newline

* align to mean indent

* pageTitle directive

automatic pageTitle directive

fix loads add ..

clean lodash dependencies

clean code

clean code & indent

clean lodash

* pageTitle directive

automatic pageTitle directive

fix loads add ..

clean lodash dependencies

clean code

clean code & indent

clean lodash
2017-08-09 22:47:01 -07:00
OldHawk
6e64b7463e add Admin submenu 'Manager Torrents' 2017-04-04 19:47:36 +08:00
OldHawk
34e11b53c5 add topbar menu: torrents,forums,chat,upload,rules,ranking,vip etc.
those menu item also added translate
2017-03-26 18:27:31 +08:00
OldHawk
111ab49b06 add many multilingual fields
add torrents and forum topbar menu
2017-03-26 00:52:31 +08:00
mleanos
99e5803eae Fix client-side tests after removing <base/>
Fixes the client-side tests after the removal of the <base/> tag from
the main layout.

These fixes aren't ideal. At the moment, they will suffice. This comment
(https://github.com/angular-ui/ui-router/issues/212#issuecomment-60803437),
among others in that issue, led me to choose this method as the fix to
avoid having to change any other core code.
2016-10-10 17:11:25 -07:00
mleanos
c065246a23 Update path in tests
Updated tests to account for new "/" prefix in the path.
2016-10-10 16:05:10 -07:00
Cameron Behar
aebaf2ff74 fix(core): Remove the <base> tag. 2016-10-10 16:05:10 -07:00
Michael Leanos
c96f8c0b56 fix(articles): Article controllers name conflicts (#1428)
* fix(articles): Article controllers name conflicts

Fixes the naming conflicts for the Articles controllers.

Due to how Angular injects the controllers into the StateProvider,
naming conflicts were caused between the Articles public & admin module
controllers.

To resolve the issue the referenced controllers in the Articles admin
route configurations must be unique, and match up with the Admin
controllers.

* Client-side tests failing

Fixed the client-side tests that were failing due to the naming
conflicts.
2016-08-26 13:27:43 +03:00
Michael Leanos
89075cb8d3 feat(articles): Article Admin feature (#807)
This feature introduces a breaking change, that restricts the User's that
can create/edit/delete Articles to only those that have the `admin` Role.

Fixed ESLint issues.

Resolved merge conflicts, and moved new client Article Service
`createOrUpdate` functionality to new Admin feature controller.

Removed edit functionality from client-side Article controller.
2016-07-25 17:34:06 -07:00
Ryan Hutchison
b2462ec86c feat(core): Modify core module to implement style guidelines.
Update the core module to implement the style guidelines.
Reduce size of init.js - moved filter logic out to it's own config.
Rename Menus to menuService
2016-03-23 15:41:57 -04:00
Marek Grzybek
d14d5130af feat(config): Deprecate JSHint in favor of ESLint
Add basic ESLint setup extending well-known Airbnb code style.

Fixes #1072, #1097
2016-03-15 19:11:12 +01:00
IteloFilho
49f6a83032 feat (title): Dynamic Title: Improve SEO 2016-02-10 12:12:10 -03:00
Ryan Hutchison
b3ad56efa3 feat(articles): Modify articles module to implement style guidelines.
Update the articles module to implement the style guidelines.

Much of this work is from @trainerbill

Closes #874
Closes #339
2016-01-02 01:53:59 -05:00
Cody B. Daig
9fc6091ab7 Code from mleanos 2015-08-14 16:01:16 -06:00
Cody B. Daig
e68b4226bd Make TopBar Public By Default 2015-08-14 16:01:16 -06:00
Andrew Throener
d319f9203f Initial commit to return /client to the URL include paths
Conflict Resolve

Fixed Karma testing

Added back cacheIDFromPath as I am not sure what that does.  Just removed the replaceing of /client
2015-08-13 11:07:02 -05:00
Cody B. Daig
cbebed9188 Allow Guests to view Articles 2015-08-08 18:40:59 -07:00
Ryan Hutchison
ef3a3f9548 formatting reboot (space-2 and consistency)
JSCS fixes

update editorconfig
2015-07-31 10:04:02 -04:00
Ryan Hutchison
60660204ac Admin module base & user admin implementation.
update displayName

implements #700 (client-side role security) on angular routes.
2015-07-24 20:03:35 -04:00
Andrew Throener
1b54d35305 Final Clean Up after code review 2015-07-24 17:06:55 -05:00
Andrew Throener
03a4042a33 Updated routes and a logic fix 2015-07-24 16:43:46 -05:00
Andrew Throener
fb71619e0c Refactor 2015-07-24 15:37:26 -05:00
Igor Freire
e21805f20a Prepare for role-based access control of states 2015-07-24 16:59:13 -03:00
Igor Freire
9fc88e6e5b Filter states for which login is required during state change
A state parameter was added for the routes that require user authentication. Now, everytime a statechange occurs, the destination state is checked and user is redirected to signin page if necessary. Note the state parameter is added within `data`, so that nested states can inherent its value.
2015-07-24 16:17:14 -03:00
Christian Berendt
4879a8ea2a Remove executable bit when not necessary
The executable bit is set for a lot of files where it is not necessary
to have the executable bit set. This PR removes the executable bit from
those files.
2015-02-16 14:19:56 +01:00
Amos Haviv
ab81d61bd3 New 0.4 version 2014-11-10 23:12:33 +02:00