Commit Graph

522 Commits

Author SHA1 Message Date
ar1g
005162ad35 Update home.client.view.html
alot -> a lot (in Angular blurb)
2014-06-16 17:43:11 +01:00
ar1g
595f858756 Update home.client.view.html
Added missing words to MongoDB blurb.
2014-06-16 17:38:21 +01:00
Amos Haviv
9da3bc87fb Merge pull request #90 from Squ34k3rZ/patch-1
Update header.client.view.html
2014-06-11 23:14:27 +03:00
Amos Haviv
d0c553d27b Merge pull request #83 from neilsh/master
Corrected "Yoeman" typo in client HTML home
2014-06-11 23:12:10 +03:00
Squ34k3rZ
83ceb27f84 Update header.client.view.html
Correct spelling
2014-06-05 15:38:59 -05:00
Neil Halelamien
1625479513 Corrected "Yoeman" typo in client HTML home 2014-06-02 22:51:59 -07:00
Amos Haviv
9db5e71830 Fix password validation error in change password 2014-06-01 23:46:17 +03:00
Amos Haviv
5e3b1af5ef Merge branch '0.3.1' 2014-05-26 02:21:04 +03:00
Amos Haviv
2f6a0cebd3 Updating Build Files 2014-05-26 02:11:31 +03:00
Amos Haviv
d9231ccc3f Fixing Grunt Watch 2014-05-26 01:56:08 +03:00
Amos Haviv
987634ee2a Fixing Salt Save Error
This fixes #75
2014-05-26 01:04:29 +03:00
Amos Haviv
a7cb2b8dbc Revert "Merge branch 'pr/76' into 0.3.1"
This reverts commit cdd6aacd09, reversing
changes made to a29ec2435f.
2014-05-26 00:55:18 +03:00
Amos Haviv
cdd6aacd09 Merge branch 'pr/76' into 0.3.1
Conflicts:
	public/modules/articles/views/list-articles.client.view.html
2014-05-26 00:54:57 +03:00
Amos Haviv
a29ec2435f Fixing menu 2014-05-26 00:49:26 +03:00
Dylan Johnson
7770cccc8b Remove ng-init directive from article list. 2014-05-25 10:59:49 -04:00
Amos Haviv
3ee0e8631a Update UIBootstrap Version 2014-05-22 14:43:02 +03:00
Amos Haviv
3cc8caf111 Fixing Header Active items 2014-05-22 12:32:55 +03:00
Amos Haviv
6455bdceae Fixing HTML issues with home 2014-05-20 20:36:39 +03:00
Amos Haviv
62bf313c6a Simplified Gruntfile, Minor Bug Fixing 2014-05-20 20:19:51 +03:00
Amos Haviv
c290dc90a2 Fix indentation 2014-05-20 19:03:18 +03:00
Amos Haviv
d98205a005 Merge branch 'pr/70' into 0.3.1 2014-05-20 18:59:03 +03:00
Amos Haviv
30f977cb38 Support ngmin 2014-05-20 18:58:10 +03:00
Amos Haviv
6354178e12 Merge branch 'pr/72' into 0.3.1
Conflicts:
	app/tests/user.server.model.test.js
	public/modules/articles/config/articles.client.config.js
	public/modules/core/controllers/home.client.controller.js
	public/modules/core/services/menus.client.service.js
2014-05-20 18:51:26 +03:00
Amos Haviv
a7aa199019 Fixing indentation 2014-05-20 18:22:38 +03:00
Amos Haviv
75a9eda55e Moving to ng-bind fixing submenus 2014-05-20 18:15:04 +03:00
Amos Haviv
5c6efe2f60 Merge branch 'pr/69' into 0.3.1 2014-05-20 16:59:09 +03:00
Amos Haviv
dba1e8b2f2 Fixing grunt and version issues 2014-05-20 16:58:45 +03:00
arve0
9067499056 use ngmin, save some typing 2014-05-20 14:22:54 +02:00
Charles Packer
2aebecaa40 Added user test file 2014-05-19 15:39:58 -07:00
Michael Cole
c8e62e1005 Typo 2014-05-19 12:26:07 -05:00
Michael Cole
e746749650 Add 'grunt debug' task 2014-05-19 12:22:55 -05:00
Amos Haviv
2f3b951711 Fixing Versions 2014-05-19 17:40:11 +03:00
Amos Haviv
9575fdcfd4 Fixing Conflicts 2014-05-19 17:38:07 +03:00
Amos Haviv
59fc0de43d Merge branch 'pr/63' into 0.3.1
Conflicts:
	app/tests/user.server.model.test.js
	public/modules/articles/config/articles.client.config.js
	public/modules/core/controllers/home.client.controller.js
	public/modules/core/services/menus.client.service.js
2014-05-19 17:33:01 +03:00
Amos Haviv
be7cd4c422 Merge branch 'pr/61' into 0.3.1 2014-05-19 17:31:47 +03:00
Amos Haviv
1c5a7323e2 Merge branch 'pr/60' into 0.3.1 2014-05-19 17:31:26 +03:00
Michael Cole
66bf2dca4c Typo in test message: 2014-05-14 07:08:08 -05:00
Samuel Vijaykumar M
7cf1fc2adb Changed all the indents to the spaces(tab size 4) 2014-05-14 16:05:15 +05:30
Michael Cole
57f1e242fc Add a little info about the sample app 2014-05-12 22:36:14 -05:00
Michael Cole
46092dd1d2 Reformat and bootstrappify the client home view. 2014-05-12 22:24:14 -05:00
Ernest Conill
4fd55e4f6b minor fixes on client view 2014-05-11 00:31:38 +02:00
netusco
c89c8911f9 minor change on addMenuItem 2014-05-11 00:18:34 +02:00
netusco
e0fc7457b9 little fix on removeSubMenuItem() 2014-05-10 13:47:36 +02:00
Amos Haviv
95037207f8 Fixing some typos 2014-05-09 20:20:59 +03:00
Amos Haviv
4930d8120e Merge pull request #57 from netusco/master
Wrong property on removeMenuItem
2014-05-09 20:12:31 +03:00
netusco
12e81fd673 Create dropdown on menuitems with submenus 2014-05-09 13:54:00 +02:00
netusco
d0268ed319 updating calls to addMenuItem and addSubMenuItem
We can still create normal MenuItems without the 'dropdown' class.
2014-05-09 13:48:35 +02:00
netusco
7adb7f3ea2 adding submenus functionality to the menu service
When having few modules like Articles, Blog, Services, etc... it's good to add the 'New Whatever' or other functionalities within a submenu structure.
2014-05-09 13:44:03 +02:00
netusco
fca7e9ed6e fixing removeMenuItem on menu service
Object menus had an unknown property menuItem that corresponded to link property (see addMenuItem).
2014-05-09 13:22:48 +02:00
Amos Haviv
0e7ebb6da8 Fixing OAuth authentication 2014-05-08 00:14:59 +03:00